statusMenu: fix menu items to match latest mockups

Rename a few, and add Suspend and Restart, although currently they do
the same thing as Shut Down (ie, they bring up a dialog that lets you
do any of those three). This will be fixed later when we have the
in-shell modal dialogs for these features.

https://bugzilla.gnome.org/show_bug.cgi?id=631193

diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js
index 1979668e18e1e963042a6563cd749dffa3557a09..89eb4eb08265778c63b59d4d8fc8e5a459198715 100644 (file)
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@@ -109,11 +109,11 @@ StatusMenuButton.prototype = {
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("Account Information..."));
-        item.connect('activate', Lang.bind(this, this._onAccountInformationActivate));
+        item = new PopupMenu.PopupMenuItem(_("My Account..."));
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("System Settings..."));
+        item = new PopupMenu.PopupMenuItem(_("System Preferences..."));
         item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
         this.menu.addMenuItem(item);
 
@@ -133,6 +133,17 @@ StatusMenuButton.prototype = {
         item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
         this.menu.addMenuItem(item);
 
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Suspend"));
+        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Restart..."));
+        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
+        this.menu.addMenuItem(item);
+
         item = new PopupMenu.PopupMenuItem(_("Shut Down..."));
         item.connect('activate', Lang.bind(this, this._onShutDownActivate));
         this.menu.addMenuItem(item);
@@ -142,7 +153,7 @@ StatusMenuButton.prototype = {
         this._presence.setStatus(status);
     },
 
-    _onAccountInformationActivate: function() {
+    _onMyAccountActivate: function() {
         Main.overview.hide();
         this._spawn(['gnome-about-me']);
     },